Discard single lines of code. Cherry-pick commits. Work with Submodules. Use git-svn and git-flow... Tower is as powerful as Git - but without the sharp edges.
swww.git-tower.com